merge with xen-unstable.hg
authorawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Tue, 27 Mar 2007 18:21:48 +0000 (12:21 -0600)
committerawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Tue, 27 Mar 2007 18:21:48 +0000 (12:21 -0600)

Trivial merge